-
-
Notifications
You must be signed in to change notification settings - Fork 495
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix #1731 #1740
Fix #1731 #1740
Conversation
Can you add some basic test, so we can check for any compiler errors @wbloszyk ? |
I only revert some changes from 9533247. I dont think test is needed here. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tests fail, if we are going to revert it, I think it's better to just revert it completely instead of doing it manually.
@franmomu Lookat tests. It blockBundle issue. sonata-project/SonataBlockBundle#701 (review) should fix it. |
So I guess it will need a release of BlockBundle and bump to that version in this PR. |
There is a new block release, can you please test this @wbloszyk |
@core23 I check with |
Can you please rebase to trigger Travis |
@core23 close and open also trigger Travis |
composer.json
Outdated
@@ -79,7 +79,7 @@ | |||
"nelmio/api-doc-bundle": "^2.13.4", | |||
"sensio/framework-extra-bundle": "^5.1", | |||
"sonata-project/admin-bundle": "^3.18.3", | |||
"sonata-project/block-bundle": "^3.17", | |||
"sonata-project/block-bundle": "^3.18", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No adjustment here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is require-dev section. Someone can use --no-dev
so I change conflict too. Now obły 3.18.5 is possibile to use. Adjustment is not require here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You might want to reconsider because of the timeouts. Requiring 3.18.5
will reduce the problem space and could help
@greg0ire Can you look at travis? Timeout on |
I noticed that things went really fast locally, so let's see if this could have to do with xdebug, which is enabled by default on Travis, and which we disable, maybe a little too late. |
No improvement… bummer, let's try something else. |
Composer seems to be on a loop 😅 |
I cancelled your job, it's over 10 mn… |
@greg0ire I run it without change in composer.json and it worked. It look like something is wrong with upgrade sonata-project/block-bundle conflict/require-dev. |
Locally, this takes 30 passes for me to resolve… so maybe this also has to do with php 7.2 or something. |
Can you finish this, so we can create a bugfix? @wbloszyk |
A rebase could fix the problem |
I use CoreBundle, sorry, fixed. |
Subject
It is quick fix. Other things like support for BlockBundle 4.x will be add with sonata-project/SonataBlockBundle#700
I am targeting this branch, because it is BC. (Revert some changes)
Closes #1731, #1732, #1737